configs: Use config_distro_defaults.h in ti_armv7_common.h

CONFIG_BOOTDELAY is defined in config_distro_defaults.h

Signed-off-by: Matwey V. Kornilov <[email protected]>
[trini: Drop omap3_logic.h settings which were a warning and no longer
        correct usage].
Signed-off-by: Tom Rini <[email protected]>

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index ecd56158597f60f3f8f3fe2eae4e2b692f129c76..7b60f29bd27c3ad923f391742eb2ea752c27d9d1 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -272,13 +272,4 @@
 
 #endif /* (CONFIG_CMD_NET) */
 
-/*
- * BOOTP fields
- */
-
-#define CONFIG_BOOTP_SUBNETMASK                0x00000001
-#define CONFIG_BOOTP_GATEWAY           0x00000002
-#define CONFIG_BOOTP_HOSTNAME          0x00000004
-#define CONFIG_BOOTP_BOOTPATH          0x00000010
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 32bb805f781aa592f10c49d4a16c351b35adda27..7810dd6c30284f13959ea50cd067739a7b194cd0 100644 (file)
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -66,11 +66,6 @@
                "root=PARTUUID=${uuid} rw " \
                "rootfstype=${mmcrootfstype}\0"
 
-/*
- * Default to a quick boot delay.
- */
-#define CONFIG_BOOTDELAY               1
-
 /*
  * DDR information.  If the CONFIG_NR_DRAM_BANKS is not defined,
  * we say (for simplicity) that we have 1 bank, always, even when
@@ -288,4 +283,6 @@
 #define NETARGS ""
 #endif
 
+#include <config_distro_defaults.h>
+
 #endif /* __CONFIG_TI_ARMV7_COMMON_H__ */